Skip to content

Conversation

@dkijania
Copy link
Member

@dkijania dkijania commented Oct 17, 2025

merge master into release/3.3.0 + fixing conflicts

This PR is specifically to fix merges conflicts between master and release/3.3.0. no feature is intended to be added. The changes we are porting are CI and test code.

The main reason for fixing conflicts are to have a green CI run on release/3.3.0 and if there is immediate need to add another patch etc. we have clean path to do it without worrying about future conflicts we are deepening.

@dkijania dkijania self-assigned this Oct 17, 2025
@dkijania
Copy link
Member Author

!ci-build-me

@dkijania dkijania changed the title Merge master into release/3.3.0 merge master into release/3.3.0 Oct 17, 2025
@dkijania
Copy link
Member Author

!ci-build-me

@dkijania dkijania marked this pull request as ready for review October 20, 2025 16:07
@dkijania dkijania requested review from a team as code owners October 20, 2025 16:07
# PublishPackages.publish
(specs_for_branch "master" DebianChannel.Type.Master)
( specs_for_branch
"dkijana/port_publish_fix_master"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this slipped in intentionally? @dkijania

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh crap! good good catch

@dkijania
Copy link
Member Author

!ci-build-me

@glyh
Copy link
Member

glyh commented Oct 21, 2025

Clean merge is broke again. Probably should merge #17972 and #17973 first?

@dkijania
Copy link
Member Author

!ci-build-me

@georgeee
Copy link
Member

!approved-for-mainnet

@dkijania dkijania merged commit 5b0a889 into release/3.3.0 Oct 21, 2025
38 checks passed
@dkijania dkijania deleted the dkijania/merge_master_to_3_3_0 branch October 21, 2025 19:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants